*** empty log message ***

diff --git a/src/ChangeLog b/src/ChangeLog
index 369846e302d6e8ddccd60b9342b06e77db244898..1010b03814cf80785b6f511d300e042bf8b057fd 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -15,7 +15,6 @@
 
        * coding.c (code_convert_region_unwind): GCPRO arg.
 
->>>>>>> 1.4762
 2005-12-12  Jan Dj\e,Ad\e(Brv  <jan.h.d@swipnet.se>
 
        * xfns.c (compute_tip_xy): Calculate root_y the same way as root_x,